edited and added some rules