Changed all stuff around again, hopefully works this time