Merged revamp branch