Updated to using newest features