few little changes - view and exchange model