Got rid of Innerclass