Adding modifications as per conversations

Also note, that it may make sense for this stuff to be pulled out into a different class