added decorator pattern for moving figures