commit before converting client to lsc
client side converted to lsc
tests updated