Modification and rebuild of Team Legato