Re-commit last know working file + minor fix