Updated to 07-shapes