improve the entry activity rotating process