Updated sources
Stable as rock