Implementing #Story17 with this change