refactoring
refactroing of old models