reverted to may7 (new dev in dev branch)