fixed mistake and added two additional classes