Addressed Valera's comment