[UPDATE] small changes