Updated to version 2 for deployment