re-checked following module code