Made bpsf requested changes except for new footer