Combined all TO-DO rule changes