Removed # NOTE: Redundancy