Modification to make rules better