Ugh
Fixed stuff