Some smal changes