Adding initial changes for #290