added some to-dos for optimization