Re added 058 draft