Added initialization step to setup