revamped more stuff