Fixed cycles again, updated core