Upgraded for 1.5 improvement project