Updates by vanderlande