EWD-1363 Updated version