Changes made on bug3 branch

Changes made on bug3