major updates to user plugin