TODO and FIX comments added