Minor modifications to processing