Updated ujdi with optimist