added some  basic changes