solution commit + testing