Upgrade lame (long overdue)