No longer hardcoding users name