stable commit

last commit before switching to test branch