Changed to not use objects