changed email address, removed commented out code