STILL NOT WORKING BUT KINDA BETTER