more factoriztaion and a FIXME note