Adding Ivan, Mak, Zeilend. Switching all can references to local references