started changes to allow execution of non entries