Encorporated further changes on register controller