this is the merged version out of mine