v3.0 Changes into dev