slimmed down and fixed up