added status ok
aligned emit messages