Updated listener app