working except removed listener