Potential major changes to improve performance