Added another restriction case and some TODOs