Removing exec + improving tab logging