changed the extended classes