Setup + fix cs