Updated to include logs