Removed latched controller from DWA and separated everything in "logical" functions