roster with goals
fixed merged changes