More restructure, proper end zone and modified maps