base optimization

base optimization