some basic changes