fixed up Julian's mess