changes from working with Craig