Added disk and cylinder