Completed Uthmani minimal and most of simplified enhanced