edited listener, did not work but cleaned stuff up