Added former code