amends to try to make it works