Edits for 4.1.1 and 4.1.2 Heather + some Aaron