re-added changes
readded old stuff (2) - dont use previous version