Adding latest changes