Updated to remove spaces