Added Michelle's changes