V0.2.1b: WIP changes windows