Some minor changes as was agreed upon