Update scheduling

added scheduling per client
not sure what's up with the indentation here. maybe create a variable or something to make it cleaner