Updated as per Mel's changes