A bit tweaking here and there