committing all changes 4/11/14