Beta1.1.0 soooo many changes