Swicth to simplee more and align for 5.7.1