Code revision

on the listener