added some stuff deleted by revert