minor changes. base