Abdullah - Re-commit last changes