some changes in classes for very specific tasks