Rolled back adcps changes, moved to another branch