few changes, still broke