Revamped the entire project