change ordering...is this fine...?