Restructured into separate triangle object