Correction of code structure
Bump moved to data