Motor issue related

Performance related