updated with solo challenge