[AUS002][RQ1] Ya funcionando sin harcodeo
Merge
merge2
merge3