Remove START weirdness and have better features