Text and logic changes
Changes with latest amendments
Test Changes