Changes that fix EOF error, commit to show Yura