Changed classes to avoid adjoiging classes