Added current dia, still needs to be prettied up