updated setup helper