Revamped some stuff.