Movement, more types, more objects