Some changes in code to follow FlimFlamboyant modifications