Re-commit my old code+changes because somebody has overwritten my code
since last week.