small changes in classes names have been made