Updated functional
Updated discussion