Fixed All Bugs, working version 2