removed TODO .. it is done