ACCP-2.0

Changes are reverted as logic hook was not working