few more changes, getting closer