Major code revamp in certain areas