Fixed some mixing added to-do