improved getter/setter section