Took out library stuff