more @-ification