Update to lyoness code