More tweaks, getting closer to the problem