merging bbyler's stuff