refactoring + new functionality
delete omiotis