Add/Update solutions 16.7-16.15