Seers impelmentation
merge conflict