implementing josh feedback #2