improvements for final




Comments