adjusted to 'common.js'