Better management of modifiedQ