Aligning behaviors

Aligning behaviors with Prefrr©