Revamped pretty much everything