Final revB 1030926

This is the final version of Komom02