some changes and improvements, more team members added