revamped entire thing