Efficiency 1.17d

Fixes #1500 
Fixes #1502