decoration looks to be really working; need more tests