More modifications to the system, registration added