removed old methods
new stuff