New format

Removed dependencies, new format code