Few changes befor we.... MEEEEERRRRRGE!