Fixes #5 - Modify Operation