Partial, updates for issue 1