Some improvements added