just a little bit better but not finished