Updated for version 2.8.7