added TODOs for saving time