removed some stuff, let's see if it works