Removed Duplicate Code from Mauris