References #123, added visuals.