attempting bug fixes - Amend