Logic Update

fixes #6