Added set checking
Added TODO