both scenarios working now