Pulling all of sams changes till now. ..