WIP: minor changes