Small chang to existing constructor