Develop: upgraded and tested to latest core