OPT: added rigid option. NOT FINISHED