clay pigeon tank
merging all changes