updated for version 1.8.5