Pushing Pairin's working version