changed some class imports