Final With few changes needed