Still trying to fix some bugs