few tweaks, getting closer