Control functions revised