scheme hcs updates
merged