The constructor is more complete now.