Make improvements based on feedback by Nik Nikonev