Adding latest changes with error