added updates based on Client feedback