made changes according to the latest cowboy tweaks