removed use of Default class