creativity: apply new recommended usage of Modal