Updated to new string format syntax