in process of adding/testing moving with conditions