v2.0 - Re-commit of version 2