slight restructure of cowboy project