updated to have moar logging