Updated and cleaned up before WIPJam event