new arch, fixes #19