better syntax and add FIXME comments