Ivan

- fix import & join