Re-organized Properties