made specs a bit more general