Updated YASRE and YASQE in demo #36

Closes #36