A lot of changes including showing substitutions on device