modifed client for integration