Redundancy

I merged redundancy with master