moved stuff around so it works in MAMP
small fix