WIP #218 and #220