first commit - modified library and admin module