some changes - incapsulation