Still trying to fix some stuff