New version with full source