some improvments to base model