A bit more updates added, but the finalising touches are still yet to be done