Added bae functionality