tweaked but still broken