porting over changes from fatdaddios.com