merged jennys changes