modified
added more rules