Version 2: Update movement & comments