TakiShiwa/Rework

This is used to rewrite the existing code