Updated to allow 2 letter names