outsourced remaining consts