new up to date 070616