Updated Core yet again