Updates by Smith & Dale