Forked this from my friend, cause it has some bugs i want to fix
Forking this from my friend for fixes