Added features / Debugging