merging changes from tomi