EMOPIC changes made
--------------------
Database changed
Logic adapted