Release commit, live device tested (refactor, release)