Tried to remove argument checkings as the contributors note has suggested