updated with code from presentation