removed boolean that will always execute