Still improved, almost really working