Separate rules finished
fixed