merged dan utils into main