updated/some still broken