Changes according to dbrgn's input