applying latest changes