stuff deleted + editing