addressing ordering issue