new version with working configuration