This works somewhat now