merged ui 06.10-08.10 amin