updates from @phidelta