refactored to start from latest version, also less diff pain
1 file changed