Added Course information.
Dealt with conflicts