Started making changes for BAP