actually removed redundancy