Updated to use consts.