added LW and TODOs