Big improvements in functional of the program