#7 Removed changed logic