WIP -- minor adjustments