Improved but broken persona implementation