moving to a Diamond class