updated for standard experiment setup