modified to use 2.1.1-GA core