Updated version of leinigen