Modified, changed more rules