Minor changes
Test still not implemented