Fixed bug...still fixing