refactor according to changes to new dev box