Added two more helper methods, fixed unnecessary calls.