just few more stuff for the TODO