Some useful changes