Added better oversight of what the user has already done!