Tested out fixes