Removed additional constraints (no RnD for the moment)