removed function calls in libraries
did the same for week2