Implements #8