made basic changes