Updated DS compatibility to work with J3