0.0.4 version with validation fix