reading working
merge fix