merge in new changes from skeleton