Feature/amendments