refactor; more rhombus