a bit better
Think this works now!