removed some extraneous working out