adjust based on comments in #1