some chanhges for testing and fixes in class