Fixed and messed wth stuff