making some basic changes first