Latest amends from my framework