Fixed setup() function