Solves #34 and reverted back to original wording