amend a few more because this is working?