integrated some more recent changes to bumcheekascend