added i--amend f statement support