Merge coinfloor additions from gnandiga