removed old methods
merged