Some changes made to Custom Library