Fixed all the mess