Latest Changes for First Test Version