Added preview deplacement + fixed locking issue