Going to redo it in angular