changes made on server
glass fix
merge with server side changes