Issue 6

<_> not sure if I did updateLogic optimally