Moved onto completion and removed internal recursion =3