updating with partial fix to legends issue