cleaned branch for starting a clean reworked build