reverted changes, added new method