A bit modifications