Added 8.4 solution