All fixxy

Totally moved from one file to another.