Revamped entire thing