Updated Broken Functions