Encapculation change