analytics push
ascii display update
fixed merge conflict