Resolves #1 - Needs to be modified