Changed a few things on motivation