new version does not make changes to any other classes to avoid
conflicts for now