first commit

Move this line up and also fix stefan's while at it