Fixing the messsssss