removed a bit of duplication