Added start-handling