few changes from nit but need to push rest of changes