refactor wrapper condition. Move it to a seperate class
update comment
add todo comment