Bugfix and improved design.