making changes for capturing HBA