On the fly modifications for demo