added in logging