Cleaned up a but, still works but with the bug present
Suspected bug fixed