Update solution for decorator problem