Made further required changes for bcs sgai submission