some modificiiciciciations for the future