Made pinmap work