added op handling