MYLOC-59 - Adding active states