WIP furher tweaking on public app build