add some funtion including status bar etc.
resolve conflict