Edited the listener