Removed @author Nathan and @author nathanajah