Applied latest changes