many updates including ace logic
many updates including ace logic