Added libraries back for simplicity after suggestions online