Cfy 1419 update

yikes....
Perhaps we should remove it, lets talk about it tomorrow :/