Updated for new username