Next part of #227