fixed wireframes
merge
merge2