Catzie last edit for (feb 5) after merging work with Karen's