now works somewhat