added personal version to avoid merging conflicts