Using existing constant and some changes