Some smal changes!!!