Updates by Ninyo & Moore