modified for chef 12