Added partially working movement point etc. system