Added in real first and second place - also highlight current user