Made Joker's CRA bash and laser changes baseline