reworked w/ objectmap