Added more ugly code...