tweaked boolean and added strings