Changed some stuff, but this breaks when starting as app