added rigid option for speed