Updating to use NgModelController for performance/accuracy