Finished Al's update
Merge branch 'refs/heads/planning'