working on specification
fixed because of new specification
fixed because of new specification
a bit improved