Updated and fixed core.