Changes making a better interface