Resetted the last two commits since they fucked up everything