commented out logs until fix, have not touched log function