latest update with issues fixed