added id to Square