added glass support