update 2 OO concept
changed up 2