added some missing bits regarding setup