changed some class structures