More Changes, rules also working. Edge cases to be tested