Kapils suggested changes and user reg part.