Changes from stacy for redesign