various changes including simulink stuff added