2nd issue solved