Minor update. Need to re-factor the code....