Some more amends to add functionality