Should be using reader more