updated for mamp 3