commits from my mastah branch