import changes from new working again master branch