Remove skip
Couple tweaks