changed decorator and model for right conception, changed validation of number, some refactroing