Redone to reflect changes in #348