Improve motivation related domains (3)