latest changes working