modify by shauna