Modified to use a string instead of boolean