fixing abilities too
Merge branch 'development'