Fixed ALL the bugs!!!