OK, fixed up stuff