Erik changes

I guess this is how its supposed to be done?