Completed changes and removed passing of n