Further improvements added