Better functionality for start

Change-Id: I9651efe4362d51632193fa046644a53077d8a5d0