Adding removed code, from wrong merging