Updated to remove limits etc