Dealt with some redundancy