Some nice changes :)