oops, spent another 2 hours working