fixing motivatin
fixed merge