revamped the whole system