updated logging for all