Inital changes for issue #11