Updated to handle Profile in quiz