Made replay feature work.
Resolved conflict.