New patch based on feedback from Habbie