Finalizing integration with ranking code from master