got rid of blank listener
subtle changes