Separating the start behaviour, forgotten from the last commit