modified to same style