update for the new syntax and handles