:moyai: Changing the Design a Bit