Added all old feature code for comparison