Fixed code to work with BA's site update