08/05/14 ai commented out unneccesary lines