made library
refactoring..