Using CommonsOps to make is faster
Changes to make it faster