Hannah's changes