10/23/14-3 fixed all my mistakes