current update, still broken