Minor changes
Minor changes
Added more testing code, does not seem to work at the moment though