original version with deco added and because it was doing bad