more code changes, WIP