commit that address the following issues: UF-107, UF-108, UF-109