Fixed setup, removed fluid container