fixed the issue with double
updated todos