Updated to use more goodies