Do you not have separate "software engineering" and "computer science" undergrad streams?