Lets fix this mess!