Few useful changes