few changes for extra parameter