add draft check to listener