OK. Let's keep it. However, could you remove the use of the shapes module? Such module is obsolete and will be discarded soon.