finished rules i think
merged