added changes per discussion with mike \n TODO: fix cross-dateline