Fixed motivation but needs some work