added setup stuff