added some basic changes