branch changes

done by marslayman on thursday