Added proper setup