Sync'd with original ishinomakispending