release 3/6 refactor