some new chnages
private templatin finished