some more modifications
merging craps