WIP:Fixed the badness