Few updates

few updates