blah
corrected & merged