little structure added