second commit w/o conditionals added