merged changes from eliteconsulting