Updated core and development