Some improvements, still doesn't work.