Improving performance - Not cloning the mode list anymore - Lets do it more fasteeer