optimalization + todo items