FEATURE/update-stand-in-order