removed changes from MSK-131, added decorator