Added coins, refactored