make it better: with help from Philip