Some further improvements - getting closer