Minor modificatinos