Rules 1,6,7,8 corrected
Clean up