convert to use only one decorator