Restored back old SELF scheme