Not perfect but better