Added some work under cold-start