rework accessors section