Updated to match last refactor