Resolved the new 2 and the new 3 again