Added to TODO
Updated preprocessing