Could be more user friendly/run smoother