Adding improvements based on Juan's feedback