updated for version 1.1.8