Maro approved updated design skeleton