Added check for registrations and changes done as suggested