Close #11 and add some movements