My modifications