added BJS capm code,not finished