Artifact added, improved controller.