almost lost these changes because of the mac...