some more tweaks...getting closer her