Added checks and greader