Revamp more stuff