removed a little duplication