Fixed not working stuff