Moved to Reader/Writer/Closer style