Integrated Rujul's changes