Updated to latest Reader style