updating from @netatoo