Updated with 5.5 new features