Improve mechanics