radical changes to remove the annoyance of el-get