moved decorator into handlers