Lil a bit of adjustments