basic changes

basic changes