Some rework to be more like how it is in $HOME