Release 3 refactor complete