Better way of doing it...
Better back porting