Minor revamp