Major code revamping: