First attempt at tweaking