(#3136) - getting closer