Changes for 5.6

Hello. Here are the changes I made for 5.5 then 5.6