Change some tuff around