change motivation and objectives (almost finished)