Enhancement: up to spec 19