Implements #6