got rid of listener. It's not useful