minor hack, WIP