Setup changes

~ rollback to google checkout