Closes #138 - Commented out some space options