added in the basic condition