improve expe more automatic now