More improvements, but still not functioning
Improvements, but still not functioning