updated for my name/settings