Dev

to fix essue 1&2