little change into constructor