ex-135 (jebene) - need to alter BufferReader