Code revamping and behaviour enhancements.