Adding order improvements