even more changes to square and uiservice