Update scheduling

added scheduling per client
remove this please